Update Truffle import

README.md

@@ -56,7 +56,7 @@ FastR is primarily aimed at long-running applications. The runtime performance b
 
 Building FastR from source is supported on Mac OS X (El Capitan onwards), and various flavors of Linux.
 FastR uses a build tool called `mx` (cf `maven`) which can be downloaded from [here](http://github.com/graalvm/mx).
-`mx` manages software in _suites_, which are normally one-to-one with a `git` repository. FastR depends fundamentally on the [truffle](http://github.com/graalvm/truffle) suite. However, performance also depends on the [Graal compiler](http://github.com/graalvm/graal-core) as without it, FastR operates in interpreted mode only. The conventional way to arrange the Git repos (suites) is as siblings in a parent directory, which we will call `FASTR_HOME`.
+`mx` manages software in _suites_, which are normally one-to-one with a `git` repository. FastR depends fundamentally on the [truffle](http://github.com/graalvm/truffle) suite. However, performance also depends on the [Graal compiler](http://github.com/graalvm/graal) as without it, FastR operates in interpreted mode only. The conventional way to arrange the Git repos (suites) is as siblings in a parent directory, which we will call `FASTR_HOME`.
 
 ## Pre-Requisites
 FastR shares some code with GnuR, for example, the default packages and the Blas library. Therefore, a version of GnuR (currently

com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/casts/TestCasts.java

@@ -69,7 +69,7 @@ import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
  * mx --J @'-Dgraal.Dump=HighTier:1 -Dgraal.MethodFilter=*TestCasts* -Dgraal.TraceTruffleCompilation=true -Dgraal.PrintBackendCFG=false'  junits --tests TestCasts
  *
  * of course, Graal needs to be imported for this to work:
- * DEFAULT_DYNAMIC_IMPORTS=graal-core (or graal-enterprise)
+ * DEFAULT_DYNAMIC_IMPORTS=compiler (or graal-enterprise)
  */
 public class TestCasts extends TestBase {
 

documentation/dev/truffle_llvm_ffi.md

@@ -15,7 +15,7 @@ The `sulong` repository must be cloned to a sibling directory of `fastr` and bui
     mx build
     mx su-pulldragonegg
 
-The `mx build` step will clone the `graal-core` repository, if necessary, and build that also. The `mx su-pulldragonegg` step is required to be able to compile Fortran code to LLVM, which is required by FastR.
+The `mx build` step will clone the `compiler` repository, if necessary, and build that also. The `mx su-pulldragonegg` step is required to be able to compile Fortran code to LLVM, which is required by FastR.
 
 ## Additional Pre-Requisites
 

mx.fastr/mx_fastr.py

@@ -39,7 +39,7 @@ import os
 '''
 This is the launchpad for all the functions available for building/running/testing/analyzing
 FastR. FastR can run with or without the Graal compiler enabled. As a convenience if the
-graal-core suite is detected then the use of the Graal compiler is enabled without any
+compiler suite is detected then the use of the Graal compiler is enabled without any
 additional command line options being required to the mx command, i.e. it is as if --jdk jvmci
 was passed as an mx global option.
 '''
@@ -48,7 +48,7 @@ _fastr_suite = mx.suite('fastr')
 '''
 If this is None, then we run under the standard VM in interpreted mode only.
 '''
-_mx_graal = mx.suite("graal-core", fatalIfMissing=False)
+_mx_graal = mx.suite("compiler", fatalIfMissing=False)
 _mx_sulong = mx.suite("sulong", fatalIfMissing=False)
 
 _r_command_package = 'com.oracle.truffle.r.engine'

mx.fastr/suite.py

@@ -28,9 +28,10 @@ suite = {
     "suites" : [
             {
                "name" : "truffle",
-               "version" : "e4c752d5477f3177b30ba80af7cd3c3e61329d2e",
+               "subdir" : True,
+               "version" : "f19ebf4be9550d744f8c431cc466a5f87682f9c4",
                "urls" : [
-                    {"url" : "https://github.com/graalvm/truffle", "kind" : "git"},
+                    {"url" : "https://github.com/graalvm/graal", "kind" : "git"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
                 ]
             },