[GR-19768] Update Truffle import.

PullRequest: fastr/2719

Author: Pavel Marek

ci.jsonnet

@@ -1 +1 @@
-{ overlay : 'ea463d8103d5db63739861673964b3f5161088f5' }
+{ overlay : 'd4d5810e522af2d11fe33c4ef79817ba472e407c' }

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/javaGD/SVGImageContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -67,6 +67,7 @@ public Graphics getGraphics() {
     protected void resetGraphics() {
         Document document = domImpl.createDocument(SVG_NS, "svg", null);
         this.graphics = new SVGGraphics2D(document);
+        this.graphics.setSVGCanvasSize(size);
         defaultInitGraphics(this.graphics);
     }
 

documentation/dev/environment-variables.md

@@ -0,0 +1,60 @@
+# Environment variables
+In this file, we enumerate all the fastr-related environment variables
+
+## Build-time environment variables
+- `GNUR_HOME_BINARY`
+  - A path to prebuilt GNU-R
+  - See [Using pre-built GNU-R binary](building.md#GNU-R)
+- `FASTR_CC`
+- `FASTR_CXX`
+- `FASTR_FC`
+  - FastR-specific C, C++, and Fortran compilers.
+  - Used for building GNU-R from sources and/or when building native packages with FastR.
+  - Do not use these env variables if you plan to use only one system-wide version of the toolchain.
+- `FASTR_RELEASE`
+  - If set to `true`, a release version of FastR is built
+  - See [Build modes](building.md#Build-modes).
+- `FASTR_NO_RECOMMENDED`
+  - If set to `true`, no recommended packages are built
+  - See [Build modes](building.md#Build-modes).
+- `FASTR_RECOMMENDED_BINARY`
+  - 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.
+  - Used for release builds.
+  - See [Build modes](building.md#Build-modes).
+
+## Environment variables for development
+- `ECLIPSE_EXE`
+  - Path to eclipse executable used for `mx eclipseformat` or `mx checkstyle`.
+
+## Run-time environment variables
+- `FASTR_MRAN_MIRROR`
+  - MRAN mirror used by FastR for installing packages.
+  - If this env var is set, the package installation works as if calling `install.packages(..., repos=Sys.getenv('FASTR_PKGS_CACHE_OPT'))`.
+- `FASTR_REPOS`
+  - name=value pairs for setting R repositories.
+  - Will be used for something like `options(repos = ...)` in R.
+  - Example: `FASTR_REPOS=file://home/pmarek/dev/fastr/com.oracle.truffle.r.test.native/packages/repo,CRAN=file://home/pmarek/minicran/2021-02-01`.
+  - Used by `mx pkgtest` and `mx r-pkgcache` commands.
+  - For more info run `mx pkgtest --help`.
+- `FASTR_OPTION_<option>=<value>`
+  - With this pattern, you can pass an option to FastR.
+  - Equivalent to `$GRAALVM_HOME/bin/R --R.<option>=<value>`.
+  - E.g. `FASTR_OPTION_PrintErrorStacktracesToFile=true`.
+  - See `com.oracle.truffle.r.runtime.context.FastROptions`.
+- `FASTR_PKGS_CACHE_OPT`
+  - The location, and other properties of package cache directory used by `mx r-pkgcache`, and `mx pkgtest` commands.
+  - Example: `export FASTR_PKGS_CACHE_OPT='dir=$HOME/fastr_pkgcache,vm=fastr,sync=TRUE'`.
+    - `dir` points to the directory where the cache should exist, created if necessary.
+    - `vm` is either `fastr` or `gnur`
+    - `sync` is either `TRUE` or `FALSE`. If `TRUE`, the write access to the package cache is synchronized.
+- `R_GCTORTURE=<steps>`/`FASTR_GCTORTURE=<steps>`
+  - After `steps` NFI upcalls, GC will be invoked.
+  - Can be used for debugging problems with "Unknown native references".
+  - See `com.oracle.truffle.r.runtime.context.GCTortureState`.
+- `GDLOG`
+  - See `com.oracle.truffle.r.ffi.impl.javaGD.LoggingGD.java`
+- `JAVAGD_CLASS_NAME`
+  - See `org.rosuda.javaGD/src/org/rosuda/javaGD/GDInterface.java`

graal_common.json

@@ -85,23 +85,18 @@
     "Dumping debug output to '(?P<filename>[^']+)'"
   ],
   "deps": {
-    "COMMENT.common": [
-      "pip:isort is a dependency of pip:pylint. The explicit dependency on the pip package works around",
-      "https://bugzilla.redhat.com/show_bug.cgi?id=1710221 on older Redhat-based systems, and doesn't",
-      "hurt on others."
-    ],
     "common": {
       "timelimit": "30:00",
       "environment": {
-        "MX_PYTHON": "python3"
+        "MX_PYTHON": "python3.8"
       },
       "packages": {
-        "pip:isort": "==4.3.19",
-        "pip:logilab-common": "==1.4.4",
-        "pip:pylint": "==1.9.3",
+        "python3": "==3.8.10",
+        "pip:pylint": "==2.4.4",
         "pip:lazy-object-proxy": "==1.6.0",
         "pip:ninja_syntax": "==1.7.2"
-      }
+      },
+      "python_version": "3"
     },
     "linux": {
       "packages": {
@@ -132,6 +127,14 @@
       },
       "environment": {
         "ECLIPSE_EXE": "$ECLIPSE/eclipse"
+      },
+      "COMMENT.eclipse_org": [
+        "Coordinates for downloading same version as above directly from eclipse.org (used by GitHub actions).",
+        "Template URL: https://archive.eclipse.org/eclipse/downloads/drops4/R-<eclipse_org.version>-<eclipse_org.timestamp>/eclipse-SDK-<eclipse_org.version>-linux-gtk-x86_64.tar.gz"
+      ],
+      "eclipse_org": {
+        "version": "4.14",
+        "timestamp": "201912100610"
       }
     },
     "jdt": {

mx.fastr/mx_fastr_dists.py

@@ -217,7 +217,6 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
         'bin/Rscript',
         'bin/R',
     ],
-    include_in_polyglot=False,
     launcher_configs=[
         mx_sdk.LanguageLauncherConfig(
             destination='bin/RMain',

mx.fastr/native-image.properties

@@ -17,7 +17,6 @@ Args = -H:MaxRuntimeCompileMethods=20000 \
     -H:+TruffleCheckBlockListMethods \
     -H:EnableURLProtocols=http,ftp,https \
     -H:-UseServiceLoaderFeature \
-    --initialize-at-run-time=java.awt,sun.awt,javax.imageio,com.sun.imageio.plugins.jpeg \
-    --initialize-at-build-time=sun.font,sun.java2d,java.awt.RenderingHints,sun.awt.SunHints
+    --initialize-at-run-time=java.awt,sun.awt,javax.imageio,com.sun.imageio.plugins.jpeg,sun.java2d,sun.font
 
 ExcludeFromAll=true

mx.fastr/suite.py

@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.316.14",
+  "mxversion" : "6.0.1",
   "name" : "fastr",
   "versionConflictResolution" : "latest",
   "imports" : {
@@ -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" : "037265952d2d0d543c0983d470659ec629084069",
+               "version" : "cf2980ba2e8ffd62943c57edfbd95a2594d63eac",
                "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" : "037265952d2d0d543c0983d470659ec629084069",
+               "version" : "cf2980ba2e8ffd62943c57edfbd95a2594d63eac",
                "urls" : [
                     {"url" : "https://github.com/graalvm/graal", "kind" : "git"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},