[GR-19768] Update Truffle import.

PullRequest: fastr/2735

Author: Pavel Marek

ci.jsonnet

@@ -1 +1 @@
-{ overlay : '5eba2d1cff5b42403dee3128c8450e395817a2ae' }
+{ overlay : '6ee29a2fa50b3720d21f1dedc89e470620f9994c' }

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ReplacementNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,11 +65,6 @@ abstract class ReplacementNode extends OperatorNode {
         this.lhs = lhs;
     }
 
-    @Override
-    public final Node deepCopy() {
-        return RContext.getASTBuilder().process(this).asRNode();
-    }
-
     public static ReplacementNode create(SourceSection source, RSyntaxLookup operator, RSyntaxLookup variable, RSyntaxElement lhs, RNode rhs, List<RSyntaxCall> calls,
                     boolean isSuper, int tempNamesStartIndex, boolean isVoid) {
         CompilerAsserts.neverPartOfCompilation();

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallSpecialNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,12 @@
  */
 package com.oracle.truffle.r.nodes.function;
 
-import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
@@ -176,20 +174,14 @@ public RBaseNode getErrorContext() {
      */
     private RCallSpecialNode callSpecialParent;
 
-    private final boolean inReplace;
-    private final int[] ignoredArguments;
-
-    private RCallSpecialNode(SourceSection sourceSection, RNode functionNode, RBuiltinDescriptor expectedFunction, RSyntaxNode[] arguments, ArgumentsSignature signature, RNode special,
-                    boolean inReplace, int[] ignoredArguments) {
+    private RCallSpecialNode(SourceSection sourceSection, RNode functionNode, RBuiltinDescriptor expectedFunction, RSyntaxNode[] arguments, ArgumentsSignature signature, RNode special) {
         this.sourceSection = sourceSection;
         this.expectedFunction = expectedFunction;
         this.special = special;
         this.functionNode = functionNode;
         this.arguments = arguments;
         this.signature = signature;
         this.visible = expectedFunction.getVisibility();
-        this.inReplace = inReplace;
-        this.ignoredArguments = ignoredArguments;
     }
 
     /**
@@ -296,7 +288,7 @@ private static RCallSpecialNode tryCreate(SourceSection sourceSection, RNode fun
         RBuiltinDescriptor expectedFunction = RContext.lookupBuiltinDescriptor(name);
         RInternalError.guarantee(expectedFunction != null);
 
-        RCallSpecialNode callSpecial = new RCallSpecialNode(sourceSection, functionNode, expectedFunction, arguments, signature, special, inReplace, ignoredArguments);
+        RCallSpecialNode callSpecial = new RCallSpecialNode(sourceSection, functionNode, expectedFunction, arguments, signature, special);
         for (int i = 0; i < arguments.length; i++) {
             if (!inReplace || !contains(ignoredArguments, i)) {
                 if (arguments[i] instanceof RCallSpecialNode) {
@@ -348,19 +340,6 @@ public Object execute(VirtualFrame frame, Object function) {
         }
     }
 
-    @Override
-    public Node deepCopy() {
-        assert !inReplace && callSpecialParent == null && ignoredArguments.length == 0;
-        CompilerAsserts.neverPartOfCompilation();
-        RCallSpecialNode node = (RCallSpecialNode) RContext.getASTBuilder().process(this).asRNode();
-        node.functionNode = node.insert(node.functionNode);
-        node.special = node.insert(node.special);
-        if (node.visibility != null) {
-            node.visibility = insert(node.visibility);
-        }
-        return node;
-    }
-
     private RCallNode getRCallNode(RSyntaxNode[] newArguments) {
         return RCallNode.createCall(sourceSection, functionNode, signature, newArguments);
     }

documentation/dev/build-process.md

@@ -267,7 +267,7 @@ This build requires `PKG_LDFLAGS_OVERRIDE` environment variable, for example on
 
 or on some Linux distributions
 
-    export PKG_LDFLAGS_OVERRIDE="-L/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu/
+    export PKG_LDFLAGS_OVERRIDE="-L/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu/"
 
 ### Installing recommended packages
 

documentation/dev/building.md

@@ -1,5 +1,10 @@
 # Building FastR from Source
 
+TL;DR for devs familiar with GraalVM build tools:
+
+* building locally from fastr directory: `mx r-install-deps && mx --dy /compiler build && mx --dy /compiler R`
+* building GraalVM with FastR: `FASTR_RELEASE=1 FASTR_NO_RECOMMENDED=1 FASTR_CAPTURE_DEPENDENCIES=" " mx --env ce-fastr build`
+
 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.
@@ -27,7 +32,7 @@ but it can be further configured by using the following environment variables:
 * `FASTR_NO_RECOMMENDED` set to any value turns off the recommended packages build and bundling with FastR. Only applicable if `FASTR_RELEASE` is set.
 * `FASTR_CAPTURE_DEPENDENCIES` if exported overrides the set of 3rd party libraries that are bundled with FastR, the value is space separated list of "base" names of the libraries, for example, use `gfortran`, for `libgfortran.so.5`. Libraries that can be bundled are: `libpcre2-8`, `libgfortran`, `libquadmath`, and `libgcc_s`. Only applicable if `FASTR_RELEASE` is set.
 
-Note for maintainers of packages for package managers like apt or yum: it is recommended to **not bundle** any 3rd party libraries with FastR, but instead use the dependency management mechanisms of your package manager. To achieve this, export `FASTR_BUNDLE_DEPENDENCIES` set to an empty value (and build FastR with `FASTR_RELEASE`).
+Note for maintainers of packages for package managers like apt or yum: it is recommended to **not bundle** any 3rd party libraries with FastR, but instead use the dependency management mechanisms of your package manager. To achieve this, export `FASTR_CAPTURE_DEPENDENCIES` set to " " (space) and build FastR with `FASTR_RELEASE`.
 
 ## Pre-Requisites
 

documentation/dev/environment-variables.md

@@ -21,9 +21,14 @@ In this file, we enumerate all the fastr-related environment variables
   - A path to prebuilt recommended packages.
   - See [Caching recommended packages](building.md#Caching-recommended-packages).
 - `FASTR_CAPTURE_DEPENDENCIES`
-  - List of dependencies to be bundled with FastR, separated by comma.
+  - Space-separated list of dependencies to be bundled with FastR.
   - Used for release builds.
+  - For example: `export FASTR_CAPTURE_DEPENDENCIES="pcre2-8 gfortran quadmath gcc_s"`
   - See [Build modes](building.md#Build-modes).
+- `PKG_LDFLAGS_OVERRIDE`
+  - Where to find dependencies from `FASTR_CAPTURE_DEPENDENCIES`.
+  - For example: `export PKG_LDFLAGS_OVERRIDE="-L/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu/"`
+  - See [Build process](build-process.md#Release-build)
 
 ## Environment variables for development
 - `ECLIPSE_EXE`

graal_common.json

@@ -2,68 +2,121 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
   "jdks": {
     "openjdk11": {
-      "name": "openjdk",
-      "version": "11.0.11+9",
+      "name": "jpg-jdk",
+      "version": "11.0.11",
+      "build_id": "9",
+      "open": true,
+      "release": true,
       "platformspecific": true
     },
     "oraclejdk11": {
-      "name": "oraclejdk",
-      "version": "11.0.11+9",
-      "platformspecific": true
+      "name": "jpg-jdk",
+      "version": "11.0.11",
+      "build_id": "9",
+      "release": true,
+      "platformspecific": true,
+      "extrabundles": [
+        "static-libs"
+      ]
     },
     "labsjdk-ce-11": {
       "name": "labsjdk",
-      "version": "ce-11.0.16+7-jvmci-22.2-b04",
+      "version": "ce-11.0.16+7-jvmci-22.3-b02",
       "platformspecific": true
     },
     "labsjdk-ce-11-llvm": {
       "name": "labsjdk",
-      "version": "ce-11.0.16+7-jvmci-22.2-b04-sulong",
+      "version": "ce-11.0.16+7-jvmci-22.3-b02-sulong",
       "platformspecific": true
     },
     "labsjdk-ee-11": {
       "name": "labsjdk",
-      "version": "ee-11.0.16+10-jvmci-22.2-b04",
+      "version": "ee-11.0.16+10-jvmci-22.3-b02",
       "platformspecific": true
     },
     "labsjdk-ee-11-llvm": {
       "name": "labsjdk",
-      "version": "ee-11.0.16+10-jvmci-22.2-b04-sulong",
+      "version": "ee-11.0.16+10-jvmci-22.3-b02-sulong",
       "platformspecific": true
     },
     "oraclejdk17": {
-      "name": "oraclejdk",
-      "version": "17.0.1+12",
-      "platformspecific": true
+      "name": "jpg-jdk",
+      "version": "17.0.1",
+      "build_id": "12",
+      "release": true,
+      "platformspecific": true,
+      "extrabundles": [
+        "static-libs"
+      ]
     },
     "labsjdk-ce-17": {
       "name": "labsjdk",
-      "version": "ce-17.0.4+7-jvmci-22.2-b04",
+      "version": "ce-17.0.4+7-jvmci-22.3-b02",
       "platformspecific": true
     },
     "labsjdk-ce-17Debug": {
       "name": "labsjdk",
-      "version": "ce-17.0.4+7-jvmci-22.2-b04-debug",
+      "version": "ce-17.0.4+7-jvmci-22.3-b02-debug",
       "platformspecific": true
     },
     "labsjdk-ce-17-llvm": {
       "name": "labsjdk",
-      "version": "ce-17.0.4+7-jvmci-22.2-b04-sulong",
+      "version": "ce-17.0.4+7-jvmci-22.3-b02-sulong",
       "platformspecific": true
     },
     "labsjdk-ee-17": {
       "name": "labsjdk",
-      "version": "ee-17.0.4+10-jvmci-22.2-b04",
+      "version": "ee-17.0.4+10-jvmci-22.3-b02",
       "platformspecific": true
     },
     "labsjdk-ee-17Debug": {
       "name": "labsjdk",
-      "version": "ee-17.0.4+10-jvmci-22.2-b04-debug",
+      "version": "ee-17.0.4+10-jvmci-22.3-b02-debug",
       "platformspecific": true
     },
     "labsjdk-ee-17-llvm": {
       "name": "labsjdk",
-      "version": "ee-17.0.4+10-jvmci-22.2-b04-sulong",
+      "version": "ee-17.0.4+10-jvmci-22.3-b02-sulong",
+      "platformspecific": true
+    },
+    "oraclejdk19": {
+      "name": "jpg-jdk",
+      "version": "19",
+      "build_id": "26",
+      "release": true,
+      "platformspecific": true,
+      "extrabundles": [
+        "static-libs"
+      ]
+    },
+    "labsjdk-ce-19": {
+      "name": "labsjdk",
+      "version": "ce-19+27-jvmci-22.3-b02",
+      "platformspecific": true
+    },
+    "labsjdk-ce-19Debug": {
+      "name": "labsjdk",
+      "version": "ce-19+27-jvmci-22.3-b02-debug",
+      "platformspecific": true
+    },
+    "labsjdk-ce-19-llvm": {
+      "name": "labsjdk",
+      "version": "ce-19+27-jvmci-22.3-b02-sulong",
+      "platformspecific": true
+    },
+    "labsjdk-ee-19": {
+      "name": "labsjdk",
+      "version": "ee-19.0.1+1-jvmci-22.3-b02",
+      "platformspecific": true
+    },
+    "labsjdk-ee-19Debug": {
+      "name": "labsjdk",
+      "version": "ee-19.0.1+1-jvmci-22.3-b02-debug",
+      "platformspecific": true
+    },
+    "labsjdk-ee-19-llvm": {
+      "name": "labsjdk",
+      "version": "ee-19.0.1+1-jvmci-22.3-b02-sulong",
       "platformspecific": true
     }
   },

mx.fastr/mx_fastr.py

@@ -453,29 +453,29 @@ def _fastr_gate_runner(args, tasks):
                 else:
                     mx.warn('File %s is empty, skipping cran_pkg_test' % list_file)
 
-def common_pkg_tests_args():
+def common_pkg_tests_args(graalvm_home: Optional[str] = None):
     if "FASTR_REPOS" in os.environ:
         repos_arg = os.environ["FASTR_REPOS"]
     else:
         # SNAPSHOT is transformed by the pkgtest script, where it also checks for FASTR_MRAN_MIRROR env. variable
         # FASTR cannot be transformed by the pkgtest script, because it may not know FastR repo home, just graalvm_home
         fastr_pkgs_repo = os.path.join(_fastr_suite.dir, 'com.oracle.truffle.r.test.native/packages', 'repo')
         repos_arg = "SNAPSHOT,FASTR=file://" + fastr_pkgs_repo
-    graalvm_home = get_graalvm_home(fatalIfMissing=True)
-    return ["--graalvm-home", graalvm_home, "--gnur-home", gnur_path(), "--fastr-home", _fastr_suite.dir, "--repos", repos_arg]
+    _graalvm_home = graalvm_home if graalvm_home else get_graalvm_home(fatalIfMissing=True)
+    return ["--graalvm-home", _graalvm_home, "--gnur-home", gnur_path(), "--fastr-home", _fastr_suite.dir, "--repos", repos_arg]
 
-def cran_pkg_tests(list_file):
+def cran_pkg_tests(list_file, graalvm_home=None):
     cache_args = []
     cache = os.environ.get('FASTR_PKGS_CACHE_OPT')
     if cache is None:
         mx.warn("If you want to use R packages cache, export environment variable FASTR_PKGS_CACHE_OPT. See option '--cache-pkgs' of 'mx pkgtest' for the syntax.")
     else:
         cache_args += ['--cache-pkgs', cache]
-    result = pkgtest(["--verbose"] + cache_args + common_pkg_tests_args() + ["--pkg-filelist", list_file])
+    result = pkgtest(["--verbose"] + cache_args + common_pkg_tests_args(graalvm_home) + ["--pkg-filelist", list_file])
     if result != 0:
         mx.abort("package test failed")
 
-def internal_pkg_tests():
+def internal_pkg_tests(graalvm_home: Optional[str] = None):
     if not mx.suite("compiler", fatalIfMissing=False) and not mx.suite("graal-enterprise", fatalIfMissing=False):
         mx.abort("internal_pkg_tests must only be run with compiler or graal-enterprise suites")
     list_file = os.path.join(_fastr_suite.dir, 'com.oracle.truffle.r.test.native/packages/pkg-filelist')
@@ -487,7 +487,7 @@ def internal_pkg_tests():
         list_file_gctorture = list_file + '.gctorture'
         if os.path.exists(list_file_gctorture):
             list_file = list_file_gctorture
-    result = pkgtest(["--verbose", "--pkg-filelist", list_file] + common_pkg_tests_args())
+    result = pkgtest(["--verbose", "--pkg-filelist", list_file] + common_pkg_tests_args(graalvm_home))
     if result != 0:
         mx.abort("internal package test failed")
 

mx.fastr/suite.py

@@ -9,7 +9,7 @@
                "subdir" : True,
                # The version must be the same as the version of Sulong
                # TRUFFLE REVISION (note: this is a marker for script that can update this)
-               "version" : "6d51160e2f31f7b7f09b33df760766b823d4a643",
+               "version" : "1c2c688ddbaa76ec8a153a4027cb8843ea5b5cd5",
                "urls" : [
                     {"url" : "https://github.com/graalvm/graal", "kind" : "git"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -20,7 +20,7 @@
                "subdir" : True,
                # The version must be the same as the version of Truffle
                # TRUFFLE REVISION (note: this is a marker for script that can update this)
-               "version" : "6d51160e2f31f7b7f09b33df760766b823d4a643",
+               "version" : "1c2c688ddbaa76ec8a153a4027cb8843ea5b5cd5",
                "urls" : [
                     {"url" : "https://github.com/graalvm/graal", "kind" : "git"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},